Revision: tla--rnf--1.1--patch-4
Archive: robin.farine@terminus.org--arch-2003
Creator: Robin Farine <robin.farine@terminus.org>
Date: Fri Aug  1 16:09:19 CEST 2003
Standard-date: 2003-08-01 14:09:19 GMT
Summary: merge from lord@emf.net--2003b
Keywords:
New-files: 
New-directories: 
Removed-files: 
Removed-directories: 
Renamed-files: 
Renamed-directories: 
Modified-files: ./ChangeLog ./libarch/ancestry.c
    ./libarch/cmd-ls-archives.c ./libarch/cmd-merges.c
    ./libarch/merge-points.c ./libarch/merge-points.h
    ./libarch/tag.c ./libneon/Makefile.in
Modified-directories: 
New-patches: jblack@merconline.com--2003/tla--devo--1.1--patch-24
    jblack@merconline.com--2003/tla--devo--1.1--patch-25
    jblack@merconline.com--2003/tla--devo--1.1--patch-26
    jblack@merconline.com--2003/tla--devo--1.1--patch-27
    jblack@merconline.com--2003/tla--devo--1.1--patch-35
    jblack@merconline.com--2003/tla--devo--1.1--patch-36
    jblack@merconline.com--2003/tla--devo--1.1--patch-37
    jblack@merconline.com--2003/tla--tla-devo-lsarchives-regex--1.1--base-0
    jblack@merconline.com--2003/tla--tla-devo-lsarchives-regex--1.1--patch-1
    lord@emf.net--2003b/tla--devo--1.1--patch-124
    lord@emf.net--2003b/tla--devo--1.1--patch-125
    lord@emf.net--2003b/tla--devo--1.1--patch-126
    lord@emf.net--2003b/tla--devo--1.1--patch-127
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-23
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-24
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-25
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-26
    lord@emf.net--2003b/tla--small-fixes--1.1--patch-27
    robin.farine@terminus.org--arch-2003/tla--rnf--1.1--patch-4
Removed-patches: 

merge from lord@emf.net--2003b

Patches applied:

 * jblack@merconline.com--2003/tla--devo--1.1--patch-24
   Fixed star-merge example merging graph

 * jblack@merconline.com--2003/tla--devo--1.1--patch-25
   Large number of additions to the glossary (Thanks Tom)

 * jblack@merconline.com--2003/tla--devo--1.1--patch-26
   moved the glossary entry to a place that I think more sense

 * jblack@merconline.com--2003/tla--devo--1.1--patch-27
   Star merged from tom

 * jblack@merconline.com--2003/tla--devo--1.1--patch-35
   Star-merged Tom's 7/24 merge storm

 * jblack@merconline.com--2003/tla--devo--1.1--patch-36
   Star merged from Tom again. Does he ever give up on this patching thing?

 * jblack@merconline.com--2003/tla--devo--1.1--patch-37
   Imported change to ls_archives that allows one to ls-archives [regular expression]

 * jblack@merconline.com--2003/tla--tla-devo-lsarchives-regex--1.1--base-0
   tag of jblack@merconline.com--2003/tla--devo--1.1--patch-35

 * jblack@merconline.com--2003/tla--tla-devo-lsarchives-regex--1.1--patch-1
   Added regex searching to ls-archives

 * lord@emf.net--2003b/tla--devo--1.1--patch-124
   sync-tree with jblack past doc patches that wound up on a different project

 * lord@emf.net--2003b/tla--devo--1.1--patch-125
   small-fixes: ls-archives regexp feature (jblack)

 * lord@emf.net--2003b/tla--devo--1.1--patch-126
   small-fixes: prevent tagging non-existent revs and compute new-patches right in tag

 * lord@emf.net--2003b/tla--devo--1.1--patch-127
   small-fixes: minor fixes

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-23
   ls-archives regexp feature (jblack)

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-24
   fix nits in ls-archives regex support

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-25
   prevent tagging non-existent revs and compute new-patches right in tag

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-26
   add test target to libneon (again!?!?)

 * lord@emf.net--2003b/tla--small-fixes--1.1--patch-27
   fix a compiler warning

